From 9c7eaeaeee3d8daf62571cfacb8950d9d4ced77f Mon Sep 17 00:00:00 2001 From: John Stewart Date: Sun, 6 Oct 2024 19:16:36 -0400 Subject: [PATCH 1/2] fix(nextcloud): truly not require SSE-C Signed-off-by: John Stewart --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/templates/_helpers.tpl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 496df1be..c3db0fd9 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 6.1.0 +version: 6.1.1 appVersion: 30.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/charts/nextcloud/templates/_helpers.tpl b/charts/nextcloud/templates/_helpers.tpl index 5efea5d1..ea4498c1 100644 --- a/charts/nextcloud/templates/_helpers.tpl +++ b/charts/nextcloud/templates/_helpers.tpl @@ -307,7 +307,8 @@ S3 as primary object store env vars secretKeyRef: name: {{ .Values.nextcloud.objectStore.s3.existingSecret }} key: {{ .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key }} -{{- else }} +{{- end }} +{{- if (len .Values.nextcloud.objectStore.s3.sse_c_key > 0 and len .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key < 1) }} - name: OBJECTSTORE_S3_SSE_C_KEY value: {{ .Values.nextcloud.objectStore.s3.sse_c_key | quote }} {{- end }} From acc760ea8e5838f346b8315949c7a18231462625 Mon Sep 17 00:00:00 2001 From: John Stewart Date: Sun, 6 Oct 2024 19:29:08 -0400 Subject: [PATCH 2/2] fix(nextcloud): do not require SSE Signed-off-by: John Stewart --- charts/nextcloud/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nextcloud/templates/_helpers.tpl b/charts/nextcloud/templates/_helpers.tpl index ea4498c1..316b467b 100644 --- a/charts/nextcloud/templates/_helpers.tpl +++ b/charts/nextcloud/templates/_helpers.tpl @@ -308,7 +308,7 @@ S3 as primary object store env vars name: {{ .Values.nextcloud.objectStore.s3.existingSecret }} key: {{ .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key }} {{- end }} -{{- if (len .Values.nextcloud.objectStore.s3.sse_c_key > 0 and len .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key < 1) }} +{{- if and (gt (len .Values.nextcloud.objectStore.s3.sse_c_key) 0) (lt (len .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key) 1) }} - name: OBJECTSTORE_S3_SSE_C_KEY value: {{ .Values.nextcloud.objectStore.s3.sse_c_key | quote }} {{- end }}