diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-02-22 19:36:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 19:36:03 +0100 |
| commit | 4aa860b65bd796b09dc0ceffa1fdd7de31060a34 (patch) | |
| tree | 8850793f3118de3a91e2e224bcec9651e023acd0 /chart/templates/pvc-system.yaml | |
| parent | 8792128f38e19b0d7882468a4f1f9362b98793a0 (diff) | |
| parent | 6ae04d990c50c12e171fc2a3d2593fa42d9c4c9c (diff) | |
Merge pull request #1501 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'chart/templates/pvc-system.yaml')
| -rw-r--r-- | chart/templates/pvc-system.yaml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chart/templates/pvc-system.yaml b/chart/templates/pvc-system.yaml index 028551151..52398f0da 100644 --- a/chart/templates/pvc-system.yaml +++ b/chart/templates/pvc-system.yaml @@ -1,4 +1,4 @@ ---- +{{- if (not .Values.mastodon.s3.enabled) }} apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -7,7 +7,8 @@ metadata: {{- include "mastodon.labels" . | nindent 4 }} spec: accessModes: - - {{ .Values.persistence.system.accessMode }} + - {{ .Values.mastodon.persistence.system.accessMode }} resources: - {{- toYaml .Values.persistence.system.resources | nindent 4}} - storageClassName: {{ .Values.persistence.system.storageClassName }} + {{- toYaml .Values.mastodon.persistence.system.resources | nindent 4}} + storageClassName: {{ .Values.mastodon.persistence.system.storageClassName }} +{{- end }} |