From f60657e7214fb47a51009362f95bee85488316b0 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 14 Jul 2021 17:33:19 +0200
Subject: [PATCH] fix onlyoffice-deployment persistence variable
---
Chart.yaml | 2 +-
templates/onlyoffice-deployment.yaml | 4 ++--
templates/onlyoffice-pvc.yml | 31 ++++++++++++++++++++++++++++
3 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 templates/onlyoffice-pvc.yml
diff --git a/Chart.yaml b/Chart.yaml
index bb9c7fc3..e6e950e6 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
description: |
A helm chart for installing NextCloud and setting up ONLYOFFICE integration
name: nextcloud-onlyoffice
-version: 0.2.9
+version: 0.2.9-alpha1
appVersion: NC-19.0.3-OO-6.2.2.21
dependencies:
- name: nextcloud
diff --git a/templates/onlyoffice-deployment.yaml b/templates/onlyoffice-deployment.yaml
index 73a76951..42e9f08e 100644
--- a/templates/onlyoffice-deployment.yaml
+++ b/templates/onlyoffice-deployment.yaml
@@ -102,9 +102,9 @@ spec:
mountPath: /var/lib/onlyoffice
volumes:
- name: onlyoffice-data
- {{- if .Values.persistence.enabled }}
+ {{- if .Values.onlyoffice.persistence.enabled }}
persistentVolumeClaim:
- claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "onlyoffice-documentserver.fullname" . }}-onlyoffice{{- end }}
+ claimName: {{ if .Values.onlyoffice.persistence.existingClaim }}{{ .Values.onlyoffice.persistence.existingClaim }}{{- else }}{{ template "onlyoffice-documentserver.fullname" . }}-onlyoffice{{- end }}
{{- else }}
emptyDir: {}
{{- end }}
diff --git a/templates/onlyoffice-pvc.yml b/templates/onlyoffice-pvc.yml
new file mode 100644
index 00000000..13457091
--- /dev/null
+++ b/templates/onlyoffice-pvc.yml
@@ -0,0 +1,31 @@
+{{- if .Values.onlyoffice.persistence.enabled -}}
+{{- if not .Values.onlyoffice.persistence.existingClaim -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+ name: {{ template "onlyoffice-documentserver.fullname" . }}-onlyoffice
+ labels:
+ app.kubernetes.io/name: {{ include "onlyoffice-documentserver.name" . }}
+ helm.sh/chart: {{ include "onlyoffice-documentserver.chart" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
+ app.kubernetes.io/component: app
+{{- if .Values.onlyoffice.persistence.annotations }}
+ annotations:
+{{ toYaml .Values.onlyoffice.persistence.annotations | indent 4 }}
+{{- end }}
+spec:
+ accessModes:
+ - {{ .Values.onlyoffice.persistence.accessMode | quote }}
+ resources:
+ requests:
+ storage: {{ .Values.onlyoffice.persistence.size | quote }}
+{{- if .Values.onlyoffice.persistence.storageClass }}
+{{- if (eq "-" .Values.onlyoffice.persistence.storageClass) }}
+ storageClassName: ""
+{{- else }}
+ storageClassName: "{{ .Values.onlyoffice.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}
+{{- end -}}
--
GitLab