From 39c1ef6fcdb5cd64ec17fc2b200005fe2efcd45f Mon Sep 17 00:00:00 2001 From: WrenIX Date: Sat, 17 Aug 2024 02:51:22 +0200 Subject: [PATCH] fix(mycloud-nextcloud): add option to test different helm-chart from git --- mycloud-nextcloud/templates/release.yaml | 22 +++++++++++++++++++++- mycloud-nextcloud/templates/repo.yaml | 14 +++++++++++--- mycloud-nextcloud/values.yaml | 7 +++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/mycloud-nextcloud/templates/release.yaml b/mycloud-nextcloud/templates/release.yaml index 7992cd3..37881a4 100644 --- a/mycloud-nextcloud/templates/release.yaml +++ b/mycloud-nextcloud/templates/release.yaml @@ -7,9 +7,14 @@ spec: chart: spec: sourceRef: - kind: HelmRepository name: "nextcloud" + {{- if .Values.chart.ref }} + kind: GitRepository + chart: "./charts/nextcloud" + {{- else }} + kind: HelmRepository chart: "nextcloud" + {{- end }} install: {{- toYaml .Values.commons.helm.release.install | nindent 4 }} test: @@ -45,6 +50,8 @@ spec: name: {{ .Values.commons.mail.username | quote }} password: {{ .Values.commons.mail.password | quote }} + defaultConfigs: + imaginary.config.php: true configs: proxy.config.php: |- {{ .Values.default.language | squote }}, 'default_phone_region' => {{ .Values.default.phoneRegion | squote }}, ); + reviews.config.php: |- + array( + 'OC\Preview\Imaginary', + 'OC\Preview\MP3', + 'OC\Preview\MarkDown', + 'OC\Preview\OpenDocument', + ), + ); {{- if or .Values.commons.persistence.hostPath.enabled @@ -173,6 +190,9 @@ spec: nginx: enabled: true + imaginary: + enabled: true + metrics: enabled: true serviceMonitor: diff --git a/mycloud-nextcloud/templates/repo.yaml b/mycloud-nextcloud/templates/repo.yaml index 2b85898..d17b8da 100644 --- a/mycloud-nextcloud/templates/repo.yaml +++ b/mycloud-nextcloud/templates/repo.yaml @@ -1,8 +1,16 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository +apiVersion: source.toolkit.fluxcd.io/v1 metadata: name: nextcloud +{{- with .Values.chart.ref }} +kind: GitRepository spec: - url: https://nextcloud.github.io/helm/ + url: {{ $.Values.chart.url }} + ref: + {{- toYaml . | nindent 4 }} +{{- else }} +kind: HelmRepository +spec: + url: {{ .Values.chart.url }} +{{- end }} interval: 10m diff --git a/mycloud-nextcloud/values.yaml b/mycloud-nextcloud/values.yaml index 53fee2c..718d826 100644 --- a/mycloud-nextcloud/values.yaml +++ b/mycloud-nextcloud/values.yaml @@ -101,6 +101,13 @@ commons: # @section -- Commons Redis replicas: 0 +chart: + # -- for default set: https://nextcloud.github.io/helm/ + url: https://github.com/wrenix/nextcloud-helm.git + # -- for default set: null + ref: + branch: feat/imaginary + # -- generated by .Values.commons.masterPassword adminPassword: