From cf233cacadc0ed0cf0a01786993a69d1d059e2d7 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 13 Jan 2021 07:38:54 +0100 Subject: [PATCH] Add persistence --- zombi/mediawiki/templates/deployment.yaml | 2 +- zombi/mediawiki/templates/job.yaml | 2 +- zombi/mediawiki/templates/pvc.yaml | 22 ++++++++++++++++++++++ zombi/mediawiki/values.yaml | 7 +++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 zombi/mediawiki/templates/pvc.yaml diff --git a/zombi/mediawiki/templates/deployment.yaml b/zombi/mediawiki/templates/deployment.yaml index 4e0e427..76b7615 100644 --- a/zombi/mediawiki/templates/deployment.yaml +++ b/zombi/mediawiki/templates/deployment.yaml @@ -76,7 +76,7 @@ spec: - name: localstore-volume {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ .Values.persistence.existingClaim | default (include "mediawiki.fullname" .) }} + claimName: {{ default (include "mediawiki.fullname" .) .Values.persistence.existingClaim }} {{- else }} emptyDir: {} {{- end }} diff --git a/zombi/mediawiki/templates/job.yaml b/zombi/mediawiki/templates/job.yaml index cfd4bc3..de3c539 100644 --- a/zombi/mediawiki/templates/job.yaml +++ b/zombi/mediawiki/templates/job.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ include "mediawiki.fullname" . }} + name: {{ include "mediawiki.fullname" . }}-setup labels: {{- include "mediawiki.labels" . | nindent 4 }} spec: diff --git a/zombi/mediawiki/templates/pvc.yaml b/zombi/mediawiki/templates/pvc.yaml new file mode 100644 index 0000000..33a66ee --- /dev/null +++ b/zombi/mediawiki/templates/pvc.yaml @@ -0,0 +1,22 @@ +{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ include "mediawiki.fullname" . }} + labels: + {{- include "mediawiki.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": "pre-install" + {{- if .Values.persistence.annotations }} + {{ toYaml .Values.persistence.annotations | indent 4 }} + {{- end }} +spec: + accessModes: + - {{ .Values.persistence.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.size | quote }} +{{- if .Values.persistence.storageClass }} + storageClassName: {{ .Values.persistence.storageClass | quote }} +{{- end }} +{{- end }} diff --git a/zombi/mediawiki/values.yaml b/zombi/mediawiki/values.yaml index e1e6286..37e62f7 100644 --- a/zombi/mediawiki/values.yaml +++ b/zombi/mediawiki/values.yaml @@ -17,6 +17,13 @@ wiki: server: "https://wiki.example.org" secretKey: "1166f2af9b8c1e1401f38a11d95628629bef0b75b90d09b296390041d19c3b2c" +persistence: + enabled: false + accessMode: ReadWriteOnce + size: 5Gi + storageClass: "" + annotations: {} + database: type: postgres server: postgres.example.org