Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nextcloud): truly not require SSE-C #643

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(nextcloud): truly not require SSE-C #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c7eaea
fix(nextcloud): truly not require SSE-C
jstewart612 Oct 6, 2024
acc760e
fix(nextcloud): do not require SSE
jstewart612 Oct 6, 2024
bcb7d4a
Merge branch 'main' into main
jessebot Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/nextcloud/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: nextcloud
version: 6.1.1
version: 6.1.2
appVersion: 30.0.1
description: A file sharing server that puts the control and security of your own data back into your hands.
keywords:
Expand Down
3 changes: 2 additions & 1 deletion charts/nextcloud/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 and (gt (len .Values.nextcloud.objectStore.s3.sse_c_key) 0) (lt (len .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key) 1) }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{{- if and (gt (len .Values.nextcloud.objectStore.s3.sse_c_key) 0) (lt (len .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key) 1) }}
{{- if .Values.nextcloud.objectStore.s3.sse_c_key }}

We don't actually need to calculate the length, as if this is not an empty string, it will trigger. My above suggestion should work fine.

- name: OBJECTSTORE_S3_SSE_C_KEY
value: {{ .Values.nextcloud.objectStore.s3.sse_c_key | quote }}
{{- end }}
Expand Down